* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified

weight when testing attributes (Bug#3282).

diff --git a/src/ChangeLog b/src/ChangeLog
index 171ca19eb7fdd12f22bc063c98cf104ec5a220da..77af9b6a22d626295cc7ecbd8d9f7438e85373fb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-14  Chong Yidong  <cyd@stupidchicken.com>
+
+       * xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
+       weight when testing attributes (Bug#3282).
+
 2009-05-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * gtkutil.c (xg_frame_set_char_size): Set frame pixel width/height to

diff --git a/src/xfaces.c b/src/xfaces.c
index 152a1d65edddb526467d094e0a99cfdbda6a42a5..444376838b956de69511bfe40670ea7e3ea7cbaa 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5175,8 +5175,9 @@ tty_supports_face_attributes_p (f, attrs, def_face)
   /* Test for terminal `capabilities' (non-color character attributes).  */
 
   /* font weight (bold/dim) */
-  weight = FONT_WEIGHT_NAME_NUMERIC (attrs[LFACE_WEIGHT_INDEX]);
-  if (weight >= 0)
+  val = attrs[LFACE_WEIGHT_INDEX];
+  if (!UNSPECIFIEDP (val)
+      && (weight = FONT_WEIGHT_NAME_NUMERIC (val), weight >= 0))
     {
       int def_weight = FONT_WEIGHT_NAME_NUMERIC (def_attrs[LFACE_WEIGHT_INDEX]);